From 7fa7d04ed0b184702089f6ff65400a28cb6c3b05 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Fri, 2 Dec 2011 21:50:10 +0100 Subject: [PATCH] NetworkMenu: show hardware disabled when rfkill is active When wifi or wwan are blocked by hardware killswitch, we should not allow changing the switch (it won't work anyway), and show "hardware disabled" instead, similar to what we already do in the bluetooth menu. https://bugzilla.gnome.org/show_bug.cgi?id=665194 --- js/ui/status/network.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/ui/status/network.js b/js/ui/status/network.js index fa2b8dfab..e22cdd839 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -249,9 +249,11 @@ const NMWirelessSectionTitleMenuItem = new Lang.Class({ updateForDevice: function(device) { // we show the switch // - if there not just one device - // - if the switch is off + // - if the switch is off (but it can be turned on) // - if the device is activated or disconnected - if (device && this._softwareEnabled && this._hardwareEnabled) { + if (!this._hardwareEnabled) { + this.setStatus(_("hardware disabled")); + } else if (device && this._softwareEnabled) { let text = device.getStatusLabel(); this.setStatus(text); } else -- 2.39.5